Revert 5da66f4..012f9ed

This rolls back to commit 5da66f4cb823ff4511291c5eaec316aa89e473d2.