Revert c6d144c..d1fc544

This rolls back to commit c6d144ca1626fa8c97587b0ff8111ef4ca447bb1.