Revert 32f7b0e..ec6e49e

This rolls back to commit 32f7b0e9a42b3942bd5f1196ccd9517e629ec1b2.