Revert 31dcb94..b542768

This rolls back to commit 31dcb941de8a889b3230e917327436aa4d91e984.