Revert 5a6d1e1..0118fd3

This rolls back to commit 5a6d1e1fe0db66f8393b50946fcc3a6f40417118.