Revert fb4c2b9..94faa18

This rolls back to commit fb4c2b91a10542b72f5ae7916229265e3158ca5f.