Reverting 210999f, as asked by @jkaplowitz