Revert c7ba303..4b2d4e9

This rolls back to commit c7ba303d5245440e27ec2548f0af8c6e5f564d99.