Revert a2bb63b..781cd07

This rolls back to commit a2bb63b1bfa9012c8623d56563e57c51c6607d9a.