Revert eb97089..38fa69d

This rolls back to commit eb97089ee930551327a1243839b8d94f98dd7f35.