Revert 2f38ae0..faabb82

This rolls back to commit 2f38ae0857eeaea288102bda94813c600397e9ea.