Revert 45c1a28..763e494

This rolls back to commit 45c1a287da201a48718dd35fec9f3b50b2a44545.