Revert f89af7d..1f493a1

This rolls back to commit f89af7df93c9605caa84b811421250664af30daf.