Revert 6b20e32..6446126

This rolls back to commit 6b20e32c78e216c0cd479ec5401a2abaea20e1eb.
FAIL