Revert af4ccab..654cb5f

This rolls back to commit af4ccabca8cabe26067da4362888d344ed99f86d.