Revert 6b8570d..9742a3f

This rolls back to commit 6b8570df31b71b75fa15d1f35ea22327fc71ebe6.