Revert fecc1ab..71dc7ed

This rolls back to commit fecc1ab77e60c83bd1092628bb7342371ad78c4f.