Revert a3ab5ff..f904f84

This rolls back to commit a3ab5ff3148b5134fd0ec144811c2271291ce25a.