Revert 5415b7a..8ceca1f

This rolls back to commit 5415b7a47557c095e07e43cbaec041480da49dc5.