Revert ec3ed38..dbb9c5e

This rolls back to commit ec3ed3852e669ddbd33eec475f9754aa9ff2d547.