Revert 70189fd..3c374d5

This rolls back to commit 70189fd778e92b716161034d4b551d5e7d561800.