Revert 3d567d6..7443487

This rolls back to commit 3d567d6ffc8441393bdf0d8bea1b20acc928dbc8.