Revert 3253954..905533e

This rolls back to commit 3253954f2f6c3f12cdbe1e894cb3965fc1bd6109.