Revert 3dd0507..3a89927

This rolls back to commit 3dd0507947e88e9f6a53f49d9e17619ebe7140af.