Revert 3716fb8..aa0f2b1

This rolls back to commit 3716fb871bee9e84ae14b015c75f5b2a0b2950b5.