Revert 322c74b..85c6ffe

This rolls back to commit 322c74bb82fe2eb440710d876fcb02acc133f8a5.