Restore old acceleration behavior until something is actually agreed on (part 2)