Revert dde6ae7..6005093

This rolls back to commit dde6ae7babdc84ab52759b9759cbc553d7b1d221.