Revert 2c83bad..55fd4c1

This rolls back to commit 2c83bad7229a3611bfbe24f471d81195f45be1a5.