Revert da71ed9..b4dd4df

This rolls back to commit da71ed9e685ec5306e7236bf127fa61f5d03507f.