Revert 1e3637c..6972465

This rolls back to commit 1e3637c95c05ea04eb40febc95c74cee602a28c7.