Revert 0af37f3..d037f0d

This rolls back to commit 0af37f3d4f8555ab53a6410bd740641e8b7af288.