Revert 25689f8..50fe31c

This rolls back to commit 25689f8119767aea534510912e4d73e43083d73c.