Revert 329ee72..7a31c6d

This rolls back to commit 329ee72bf596b4867d23c919d95e44a28f6523f0.