Revert aa1b3c2..8c21e24

This rolls back to commit aa1b3c28267e1c4d4aa1f0131bbb592c6324d191.