Revert 8fbdb57..5857c7a

This rolls back to commit 8fbdb570b22c66905caa10c7293df3bab709f646.