Revert c44bbc2..3f49bad

This rolls back to commit c44bbc2e14b1fb5af0e639c569ad1a25e22b5e92.