Revert d1539b2..d45d018

This rolls back to commit d1539b20a78a04f9c7bbb252f3ca7e072798ed56.