Revert d12906b..7b9dee0

This rolls back to commit d12906bcda1223aedc16ca09bfd2397849a1aaa2.