Revert d0dd1f6..52587c3

This rolls back to commit d0dd1f61b33d64e29d8bc1372a94ef6a2fee76a9.