Revert 1276b58..d59bca5

This rolls back to commit 1276b58a8b89d9479ad7aea1c7b061c804fe5315.