Revert ce39c3f..1281b6e

This rolls back to commit ce39c3f37ce3bfea10e54aebd7df7c22a013ffcb.