Revert c52ce7c..4381d54

This rolls back to commit c52ce7c26c096fc4fd62f17ae626e54f5600191c.