Revert 104e3df..29b6e6c

This rolls back to commit 104e3df42b75ad736252249128fdfcc7d04acb57.
Third time