Revert 3a7c95f..f391535

This rolls back to commit 3a7c95ff32cce83e27d77f3577970f707f073dda.