Revert 3d0c413..498a85e

This rolls back to commit 3d0c413be1ce39bb71218d8a498babbcd4c10f9e.