Revert 9bd0379..1c54547

This rolls back to commit 9bd0379afa5e31a126f90abe7227b19cb5efdcf2.