Revert 04f208a..d4f0850

This rolls back to commit 04f208ad84e0f3dec71bc0f9f9df69845811fc1d.
Latest?

This reverts commit 74803333b915419350144236b4d95ec38687aba1.
Merge branch 'master' into stable