Revert 79718da..0020fb0

This rolls back to commit 79718da05486082cf35844fc6b6fde2ab60e3f1a.