Revert 58b634d..3bd39a2

This rolls back to commit 58b634d9a8ae6b8a1eec8b03415696541d58bbdb.