Revert db67510..6e4b85d

This rolls back to commit db675103b83d5cebf546cc4140a47b90c1ef6694.