Revert e33ae99..13096ba

This rolls back to commit e33ae99e0297246d016623f4796ddfb27dbe7fa8.