Revert d973db1..5a9b45d

This rolls back to commit d973db18594d2bedac93600253811d3c2b8bfd9f.