Revert 57b8e17..799ee24

This rolls back to commit 57b8e17940ca1da11bd1ed02bf8cc8eeb2b06e1d.