Revert 564b824..3844940

This rolls back to commit 564b824380f45f34b8e2354251d7e6527edd5dbb.