Revert 57180de..e6177ad

This rolls back to commit 57180de2089fb8d948355fae1815532aa0a3607c.