Revert 48ab8ef..d9ef73b

This rolls back to commit 48ab8ef34e441ef86ee6144f3251e8f7fab3ba2d.