Revert 5323424..5b26b04

This rolls back to commit 5323424f3473c80126bc989b73aed43b3477a3ce.