Revert 691aa8a..28c770c

This rolls back to commit 691aa8ad21541831bb3625c1ab8e47b211c15563.