Revert 8b69b46..c65e696

This rolls back to commit 8b69b4611a1da7c66cd524faeb151cf34d310fae.