Revert 7b6c5d3..e60671d

This rolls back to commit 7b6c5d3fcd897bcac9edd42e4382f5dc42d82d23.