Revert 980fdef..2f3cb2e

This rolls back to commit 980fdefd99de87c51e7c6f6f8ffb33fb605b2455.