Revert 12d9df5..7b7370d

This rolls back to commit 12d9df542d729aa46bc2453f5d667b9c65173a75.