Revert cb164ff..61f6ae2

This rolls back to commit cb164ffe3fdef2045e3b9dfe40377692e8e196da.