Revert a77b82e..168cdf1

This rolls back to commit a77b82e42c99f8f8d5898e44969b68a8a1ce8dfa.