Revert 3277165..4e2a582

This rolls back to commit 32771652bdacfca2b58e038a2253f6e49c626c5b.