Revert da2adb3..352aede

This rolls back to commit da2adb3dc05f4190743d608d79b7ad3f6781b585.