Revert eac7916..b2a32ac

This rolls back to commit eac7916fc832d9fcbaa0c616e5506411c6ae2ebf.