Revert b545b20..0d9b05c

This rolls back to commit b545b201ced24755180d268cadfc5a2af748542f.