Revert 27cb706..1334090

This rolls back to commit 27cb7069b3e58b78e64334cef17ed791af37328f.