This reverts commit 90c147f97c3f9fcfd54dbebe8c22542a0ae6d93e. Reverting because new feature and only want bug fixes on branches.