Revert a55aae0..dc48c2f

This rolls back to commit a55aae011e86bdc946e117570b2b382f154218db.
arg