Revert ce18a55..93608d6

This rolls back to commit ce18a55425a8bd762832b0f37ebb355d46ab1c1f.