Revert 1334090..521c809

This rolls back to commit 1334090833538aaa92bada4485035ded40d86ff8.