Revert ad82767..a7831c7

This rolls back to commit ad827677054b340984a3c4423e49469feb3e3bd1.