Revert ac9ebb6..980b69f

This rolls back to commit ac9ebb604f367f866bd19ded3bb084f422bbf3fe.