Revert ada775b..71cf49b

This rolls back to commit ada775ba9e0c1d7299d1935732d0dff1f0cf13b1.