Revert 1992dc0..520ce98

This rolls back to commit 1992dc09177b9e407a298de80ed2ac507f35f0e7.