Revert a63284c..1c6ba4a

This rolls back to commit a63284c2d466266ab311cb038889df98ba7eb3cf.