Revert df6f166..81a3cac

This rolls back to commit df6f1664aa8754cb93c4a4b905fe89bf9b91272d.