Revert a0285cf..b6add2b

This rolls back to commit a0285cf7369b6f249fe06bfbd18ba5cbaad2709f.