Revert 59ff7f4..907bb09

This rolls back to commit 59ff7f46cac26173ac3e02daa3136bd08dc10b95.