Revert bb72949..e272b0c

This rolls back to commit bb72949ed0a61b46492179fc6ab9d1308114c9da.