Revert 30650ce..5025a7f

This rolls back to commit 30650ce4f3a3b8c00db90256a98242c53ffdf28a.