Revert a37df9f..478c3a4

This rolls back to commit a37df9fdce2bb8fc7baf7316c70fc80aadc1e9b3.