Revert 725a8c4..5fba0af

This rolls back to commit 725a8c4cfd0896f4123376a557e07606139b33cf.