Revert dba08e7..360c3ed

This rolls back to commit dba08e70af9c72a75b9e0313463cc703ad5c829e.