Revert 241e854..546732f

This rolls back to commit 241e8547fdb1c8fdc7d166d0443a677cab09ae98.