Revert a482ecb..7f84e1a

This rolls back to commit a482ecb8ba7c7d0dca018ececf12a811ad520440.