Revert 2c5cc97..2a789f2

This rolls back to commit 2c5cc97d7383bf84e2e287f243475591bb790164.